Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Travis CI failure of multiple_merges_during_fold_test #74

Merged
merged 3 commits into from Mar 5, 2013

Conversation

jtuple
Copy link
Contributor

@jtuple jtuple commented Dec 3, 2012

The environment that Travis runs test under unfortunately does not immediately pick up the expected number of files to merge for the different merge operations in the multiple_merges_during_fold_test. This commit changes the test to re-try merging until the expected result is seen (or eventually have the test timeout).

The environment that Travis runs test under unfortunately does not
immediately pick up the expected number of files to merge for the
different merge operations in the multiple_merges_during_fold_test.
This commit changes the test to re-try merging until the expected
result is seen (or eventually have the test timeout).
-include_lib("eunit/include/eunit.hrl").
-ifdef(TEST).
%% -include_lib("eunit/include/eunit.hrl").
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the eunit.hrl header be -ifdef'ified and uncommented? This looks like a bit of debugging cruft.

slfritchie added a commit that referenced this pull request Mar 5, 2013
Fix Travis CI failure of multiple_merges_during_fold_test

After many intermittent timing failures over in TravisCI land, we have this:

    BUILD PASSED: [bitcask jdb-fix-travis-failure:771c92d] by Scott Lystig Fritchie https://travis-ci.org/basho/bitcask/builds/5266676
@slfritchie slfritchie merged commit 66d5cae into master Mar 5, 2013
@engelsanchez engelsanchez deleted the jdb-fix-travis-failure branch March 28, 2014 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants